Adwaita: selection menu button style fixes

diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss
index 19fc3d7e1747fc66695b36c977c85ee1d41b39e8..21eed132f7452f308e2c15891c00953885fca045 100644 (file)
--- a/gtk/resources/theme/Adwaita/_common.scss
+++ b/gtk/resources/theme/Adwaita/_common.scss
@@ -777,9 +777,16 @@ GtkComboBox {
       }
     }
     .selection-menu {
-      border-width: 0;
-      background-image: none;
+      border-color: transparentize($selected_bg_color,1);
+      background-image: linear-gradient(to bottom, transparentize($selected_bg_color,1));
       box-shadow: none;
+      &:hover {
+        $_hover_color: lighten($selected_bg_color,9%);
+        border-color: $_hover_color;
+        background-image: linear-gradient(to bottom, $_hover_color);
+        box-shadow: 0 1px transparentize(black,0.85);
+      }
+      &:backdrop, &:backdrop:hover { @extend .selection-menu };
     }
   }
   .tiled &, .maximized & {
@@ -1220,9 +1227,6 @@ GtkTreeView.view.progressbar { //Progressbar in treeview cells
   }
 }
 
-//.notebook > .frame,
-//.notebook > .view { border: none; }
-
 /**************
  * Scrollbars *
  **************/

diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
index be41944ae6c9d7f7866f0c6d16a733ed87c48327..6939b94a48a97867a66079b09f314f8113a74f71 100644 (file)
--- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
@@ -973,11 +973,18 @@ GtkComboBox {
           background-image: linear-gradient(to bottom, #393f3f);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0);
           border-color: #0f2b48; }
-    .titlebar.selection-mode .selection-menu,
-    .header-bar.selection-mode .selection-menu {
-      border-width: 0;
-      background-image: none;
+    .titlebar.selection-mode .selection-menu, .titlebar.selection-mode .selection-menu:backdrop, .titlebar.selection-mode .selection-menu:backdrop:hover,
+    .header-bar.selection-mode .selection-menu,
+    .header-bar.selection-mode .selection-menu:backdrop,
+    .header-bar.selection-mode .selection-menu:backdrop:hover {
+      border-color: rgba(33, 93, 156, 0);
+      background-image: linear-gradient(to bottom, rgba(33, 93, 156, 0));
       box-shadow: none; }
+      .titlebar.selection-mode .selection-menu:hover,
+      .header-bar.selection-mode .selection-menu:hover {
+        border-color: #2974c2;
+        background-image: linear-gradient(to bottom, #2974c2);
+        box-shadow: 0 1px rgba(0, 0, 0, 0.15); }
   .tiled .titlebar, .maximized .titlebar, .tiled
   .header-bar, .maximized
   .header-bar {

diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css
index 46e6cd3dc57add0d1be7db751fae9f9654495531..64cb70212cc6a29b86929adc172ba735e604bcb8 100644 (file)
--- a/gtk/resources/theme/Adwaita/gtk-contained.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained.css
@@ -965,11 +965,18 @@ GtkComboBox {
           background-image: linear-gradient(to bottom, #ededed);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0);
           border-color: #184472; }
-    .titlebar.selection-mode .selection-menu,
-    .header-bar.selection-mode .selection-menu {
-      border-width: 0;
-      background-image: none;
+    .titlebar.selection-mode .selection-menu, .titlebar.selection-mode .selection-menu:backdrop, .titlebar.selection-mode .selection-menu:backdrop:hover,
+    .header-bar.selection-mode .selection-menu,
+    .header-bar.selection-mode .selection-menu:backdrop,
+    .header-bar.selection-mode .selection-menu:backdrop:hover {
+      border-color: rgba(74, 144, 217, 0);
+      background-image: linear-gradient(to bottom, rgba(74, 144, 217, 0));
       box-shadow: none; }
+      .titlebar.selection-mode .selection-menu:hover,
+      .header-bar.selection-mode .selection-menu:hover {
+        border-color: #70a7e1;
+        background-image: linear-gradient(to bottom, #70a7e1);
+        box-shadow: 0 1px rgba(0, 0, 0, 0.15); }
   .tiled .titlebar, .maximized .titlebar, .tiled
   .header-bar, .maximized
   .header-bar {